gnus-demon.el (gnus-demon-init): Fix time computing when time is nil.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 519f248d32258cfe426a442092251e2561f0609e..5faa9de6dfa4a2ed963be79bcea8949567af55ff 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-03  Julien Danjou  <julien@danjou.info>
+
+       * gnus-demon.el (gnus-demon-init): Fix time computing when time is nil.
+
 2010-12-03  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-util.el (gnus-macroexpand-all): Don't modify argument;

diff --git a/lisp/gnus/gnus-demon.el b/lisp/gnus/gnus-demon.el
index 94a495258471f1695bc31ea0aa4b9f493162e95c..b33a673c354815b5f62ec18755510ebb1bee4b3f 100644 (file)
--- a/lisp/gnus/gnus-demon.el
+++ b/lisp/gnus/gnus-demon.el
@@ -121,7 +121,7 @@ Emacs has been idle for IDLE `gnus-demon-timestep's."
            ;; If t, replace by 1
            (time (cond ((eq time t)
                         gnus-demon-timestep)
-                       ((null time))
+                       ((null time) nil)
                        (t (* time gnus-demon-timestep))))
            (timer
             (cond